changed expand_row/collapse_row to be 2 signals each -- test_expand_row

Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
	expand_row/collapse_row to be 2 signals each -- test_expand_row
	and row_expanded as well as test_collapse_row and row_collapsed.

diff --git a/ChangeLog b/ChangeLog
index 9e96b22b10365665d52c2fc24e8fc264c6e2837b..b8d2bcb0ea361398820cad47051f16f80af83417 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): changed
+       expand_row/collapse_row to be 2 signals each -- test_expand_row
+       and row_expanded as well as test_collapse_row and row_collapsed.
+
 2001-06-10  Anders Carlsson  <andersca@codefactory.se>
 
        * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9e96b22b10365665d52c2fc24e8fc264c6e2837b..b8d2bcb0ea361398820cad47051f16f80af83417 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): changed
+       expand_row/collapse_row to be 2 signals each -- test_expand_row
+       and row_expanded as well as test_collapse_row and row_collapsed.
+
 2001-06-10  Anders Carlsson  <andersca@codefactory.se>
 
        * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9e96b22b10365665d52c2fc24e8fc264c6e2837b..b8d2bcb0ea361398820cad47051f16f80af83417 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): changed
+       expand_row/collapse_row to be 2 signals each -- test_expand_row
+       and row_expanded as well as test_collapse_row and row_collapsed.
+
 2001-06-10  Anders Carlsson  <andersca@codefactory.se>
 
        * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9e96b22b10365665d52c2fc24e8fc264c6e2837b..b8d2bcb0ea361398820cad47051f16f80af83417 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): changed
+       expand_row/collapse_row to be 2 signals each -- test_expand_row
+       and row_expanded as well as test_collapse_row and row_collapsed.
+
 2001-06-10  Anders Carlsson  <andersca@codefactory.se>
 
        * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9e96b22b10365665d52c2fc24e8fc264c6e2837b..b8d2bcb0ea361398820cad47051f16f80af83417 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): changed
+       expand_row/collapse_row to be 2 signals each -- test_expand_row
+       and row_expanded as well as test_collapse_row and row_collapsed.
+
 2001-06-10  Anders Carlsson  <andersca@codefactory.se>
 
        * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9e96b22b10365665d52c2fc24e8fc264c6e2837b..b8d2bcb0ea361398820cad47051f16f80af83417 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): changed
+       expand_row/collapse_row to be 2 signals each -- test_expand_row
+       and row_expanded as well as test_collapse_row and row_collapsed.
+
 2001-06-10  Anders Carlsson  <andersca@codefactory.se>
 
        * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9e96b22b10365665d52c2fc24e8fc264c6e2837b..b8d2bcb0ea361398820cad47051f16f80af83417 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): changed
+       expand_row/collapse_row to be 2 signals each -- test_expand_row
+       and row_expanded as well as test_collapse_row and row_collapsed.
+
 2001-06-10  Anders Carlsson  <andersca@codefactory.se>
 
        * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 62dbbf319f07d3afa978bcfd54f729365215cc13..9c5c8f47cc49fd05c435de6a55fca4f7bd6c3e0b 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -93,8 +93,10 @@ struct _TreeViewDragInfo
 enum
 {
   ROW_ACTIVATED,
-  EXPAND_ROW,
-  COLLAPSE_ROW,
+  TEST_EXPAND_ROW,
+  TEST_COLLAPSE_ROW,
+  ROW_EXPANDED,
+  ROW_COLLAPSED,
   COLUMNS_CHANGED,
   BEGIN_EXTENDED_SELECTION,
   END_EXTENDED_SELECTION,
@@ -425,7 +427,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   widget_class->drag_drop = gtk_tree_view_drag_drop;
   widget_class->drag_data_received = gtk_tree_view_drag_data_received;
   widget_class->focus = gtk_tree_view_focus;
-  
+
   /* GtkContainer signals */
   container_class->remove = gtk_tree_view_remove;
   container_class->forall = gtk_tree_view_forall;
@@ -573,28 +575,50 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                    GTK_TYPE_TREE_PATH,
                    GTK_TYPE_TREE_VIEW_COLUMN);
 
-  tree_view_signals[EXPAND_ROW] =
-    g_signal_newc ("expand_row",
+  tree_view_signals[TEST_EXPAND_ROW] =
+    g_signal_newc ("test_expand_row",
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GtkTreeViewClass, expand_row),
+                  G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row),
                   _gtk_boolean_handled_accumulator, NULL,
                    gtk_marshal_BOOLEAN__BOXED_BOXED,
                   G_TYPE_BOOLEAN, 2,
                   GTK_TYPE_TREE_ITER,
                   GTK_TYPE_TREE_PATH);
 
-  tree_view_signals[COLLAPSE_ROW] =
-    g_signal_newc ("collapse_row",
+  tree_view_signals[TEST_COLLAPSE_ROW] =
+    g_signal_newc ("test_collapse_row",
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GtkTreeViewClass, collapse_row),
+                  G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row),
                   _gtk_boolean_handled_accumulator, NULL,
                    gtk_marshal_BOOLEAN__BOXED_BOXED,
                   G_TYPE_BOOLEAN, 2,
                   GTK_TYPE_TREE_ITER,
                   GTK_TYPE_TREE_PATH);
 
+  tree_view_signals[ROW_EXPANDED] =
+    g_signal_newc ("row_expanded",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded),
+                  NULL, NULL,
+                   gtk_marshal_VOID__BOXED_BOXED,
+                  GTK_TYPE_NONE, 2,
+                  GTK_TYPE_TREE_ITER,
+                  GTK_TYPE_TREE_PATH);
+
+  tree_view_signals[ROW_COLLAPSED] =
+    g_signal_newc ("row_collapsed",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed),
+                  NULL, NULL,
+                   gtk_marshal_VOID__BOXED_BOXED,
+                  GTK_TYPE_NONE, 2,
+                  GTK_TYPE_TREE_ITER,
+                  GTK_TYPE_TREE_PATH);
+
   tree_view_signals[COLUMNS_CHANGED] =
     g_signal_newc ("columns_changed",
                   G_TYPE_FROM_CLASS (object_class),
@@ -722,7 +746,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, "move_cursor", 2,
                                GTK_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
                                GTK_TYPE_INT, 1);
-                               
+
   gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, "move_cursor", 2,
                                GTK_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
                                GTK_TYPE_INT, -1);
@@ -4130,7 +4154,7 @@ gtk_tree_view_real_move_cursor (GtkTreeView       *tree_view,
 
   GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
   gtk_widget_grab_focus (GTK_WIDGET (tree_view));
-  
+
   switch (step)
     {
       /* currently we make no distinction.  When we go bi-di, we need to */
@@ -7036,7 +7060,7 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
   if (! gtk_tree_model_iter_has_child (tree_view->priv->model, &iter))
     return FALSE;
 
-  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[EXPAND_ROW], 0, &iter, path, &expand);
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[TEST_EXPAND_ROW], 0, &iter, path, &expand);
 
   if (expand)
     return FALSE;
@@ -7058,9 +7082,13 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
       gtk_widget_queue_draw (GTK_WIDGET (tree_view));
       _gtk_tree_view_update_size (tree_view);
     }
+
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[ROW_EXPANDED], 0, &iter, path);
+
   return TRUE;
 }
 
+
 /**
  * gtk_tree_view_expand_row:
  * @tree_view: a #GtkTreeView
@@ -7103,7 +7131,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
 
   gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
 
-  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[COLLAPSE_ROW], 0, &iter, path, &collapse);
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[TEST_COLLAPSE_ROW], 0, &iter, path, &collapse);
 
   if (collapse)
     return FALSE;
@@ -7130,6 +7158,9 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
       gtk_widget_queue_draw (GTK_WIDGET (tree_view));
       _gtk_tree_view_update_size (tree_view);
     }
+
+  g_signal_emit (G_OBJECT (tree_view), tree_view_signals[ROW_COLLAPSED], 0, &iter, path);
+
   return TRUE;
 }
 
@@ -7302,11 +7333,22 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
   gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
 }
 
+static void
+gtk_tree_view_set_anchor (GtkTreeView *tree_view,
+                         GtkTreePath *path)
+{
+  if (tree_view->priv->anchor)
+    gtk_tree_row_reference_free (tree_view->priv->anchor);
+  tree_view->priv->anchor = gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
+                                                             tree_view->priv->model,
+                                                             path);
+}
+
 /**
  * gtk_tree_view_set_cursor:
  * @tree_view: A #GtkTreeView
  * @path: A #GtkTreePath
- * 
+ *
  * Sets the current keyboard focus to be at @path.
  **/
 void

diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 83dd36afd9d7d1c354c867356a7d912eb78c9e63..bb60703b9b7932d853bd6e4aea33309018eeecaa 100644 (file)
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -70,10 +70,16 @@ struct _GtkTreeViewClass
   void     (* row_activated)              (GtkTreeView       *tree_view,
                                           GtkTreePath       *path,
                                           GtkTreeViewColumn *column);
-  gboolean (* expand_row)                 (GtkTreeView       *tree_view,
+  gboolean (* test_expand_row)            (GtkTreeView       *tree_view,
                                           GtkTreeIter       *iter,
                                           GtkTreePath       *path);
-  gboolean (* collapse_row)               (GtkTreeView       *tree_view,
+  gboolean (* test_collapse_row)          (GtkTreeView       *tree_view,
+                                          GtkTreeIter       *iter,
+                                          GtkTreePath       *path);
+  void     (* row_expanded)               (GtkTreeView       *tree_view,
+                                          GtkTreeIter       *iter,
+                                          GtkTreePath       *path);
+  void     (* row_collapsed)              (GtkTreeView       *tree_view,
                                           GtkTreeIter       *iter,
                                           GtkTreePath       *path);
   void     (* columns_changed)            (GtkTreeView       *tree_view);